Merge git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Mon, 9 Oct 2017 17:31:33 +0000 (13:31 -0400)
committerTom Rini <[email protected]>
Mon, 9 Oct 2017 17:31:33 +0000 (13:31 -0400)

Trivial merge